One more fix for display-buffer-normalize-specifiers-1.

* window.el (display-buffer-normalize-specifiers-1): Fix thinko.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c1f8df22756fe91877e68cde8238e54b99476e7..b765132bed6160f9af94e38ca08c3ed709410957 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,7 @@
        pop-up-windows is unset.  Add a reuse-window specifier for the
        case popping up a new window fails.
        (special-display-popup-frame): Remove double quoting.
+       (display-buffer-normalize-specifiers-1): Fix thinko.
 
 2011-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/window.el b/lisp/window.el
index 67a80a6a2ec8ae249e70b066728c51cfa9ef7227..211d8573e0cf208fc07b56c5b3aa7cf20c3bb23f 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5009,7 +5009,8 @@ argument of `display-buffer'."
       ;; A macro specifier.
       (cdr entry))
      ((or (display-buffer-other-window-means-other-frame buffer-name label)
-         (with-no-warnings (not pop-up-frames)))
+         (with-no-warnings pop-up-frames))
+      ;; Pop up another frame.
       (cdr (assq 'other-frame display-buffer-macro-specifiers)))
      (t
       ;; In any other case pop up a new window.